From c8bc83284a247d87885fb62a1ac17fa08c237158 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Thu, 9 Feb 2006 13:55:03 -0700 Subject: [PATCH] [IA64] take start_info page from dom0 page not from xen heap. start_info page is used for xen to pass start up information to domain0 and the page is used only by dom0 so that it should belong to dom0. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 9 +++++++++ xen/arch/ia64/xen/domain.c | 14 ++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c index 03177e2d1d..361d71172c 100644 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c @@ -61,6 +61,9 @@ #include #include #include +#ifdef CONFIG_XEN +#include +#endif #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) # error "struct cpuinfo_ia64 too big!" @@ -241,6 +244,12 @@ reserve_memory (void) rsvd_region[n].end = (unsigned long) ia64_imva(_end); n++; +#ifdef CONFIG_XEN + rsvd_region[n].start = (unsigned long) (HYPERVISOR_shared_info->arch.start_info_pfn << PAGE_SHIFT); + rsvd_region[n].end = rsvd_region[n].start + PAGE_SIZE; + n++; +#endif + #ifdef CONFIG_BLK_DEV_INITRD if (ia64_boot_param->initrd_start) { rsvd_region[n].start = (unsigned long)__va(ia64_boot_param->initrd_start); diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index ce67b49bec..5fcafa83aa 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -782,6 +782,7 @@ int construct_dom0(struct domain *d, unsigned long pkern_entry; unsigned long pkern_end; unsigned long pinitrd_start = 0; + unsigned long pstart_info; unsigned long ret, progress = 0; //printf("construct_dom0: starting\n"); @@ -839,13 +840,18 @@ int construct_dom0(struct domain *d, (PAGE_ALIGN(initrd_len) + 4*1024*1024); memcpy(__va(pinitrd_start),initrd_start,initrd_len); + pstart_info = PAGE_ALIGN(pinitrd_start + initrd_len); + } else { + pstart_info = PAGE_ALIGN(pkern_end); } printk("METAPHYSICAL MEMORY ARRANGEMENT:\n" " Kernel image: %lx->%lx\n" " Entry address: %lx\n" - " Init. ramdisk: %lx len %lx\n", - pkern_start, pkern_end, pkern_entry, pinitrd_start, initrd_len); + " Init. ramdisk: %lx len %lx\n" + " Start info.: %lx->%lx\n", + pkern_start, pkern_end, pkern_entry, pinitrd_start, initrd_len, + pstart_info, pstart_info + PAGE_SIZE); if ( (pkern_end - pkern_start) > (d->max_pages * PAGE_SIZE) ) { @@ -900,9 +906,9 @@ int construct_dom0(struct domain *d, /* Set up start info area. */ - si = (start_info_t *)alloc_xenheap_page(); + d->shared_info->arch.start_info_pfn = pstart_info >> PAGE_SHIFT; + si = __va(pstart_info); memset(si, 0, PAGE_SIZE); - d->shared_info->arch.start_info_pfn = __pa(si) >> PAGE_SHIFT; sprintf(si->magic, "xen-%i.%i-ia64", XEN_VERSION, XEN_SUBVERSION); si->nr_pages = d->tot_pages; -- 2.30.2